Delete unused classes
Clean-up
Keep restart flag in one place