Factor more logic into start/stop for cleanup