Remove old code for restart

Much of the code is dead/commented out and is not executed. Removing it will help with making and understanding new changes.