Clean a few lines out of the main class