Cleaning everything up, freaken sub modules