Cleaning up some things in the start script