Tidy up the stop/start files and make switch usage consistent. Also tidy up the various "clean" targets in the Makefile. (cherry picked from commit b24c2e11d8)
b24c2e11d8