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) (cherry picked from commit 78494c3a4d) (cherry picked from commit 28c2b0be93)
b24c2e11d8
78494c3a4d
28c2b0be93