Clean-up start, stop, restart functions