Cleanup and extra code removal