Update start and stop scripts, remove cruft