Remove commented out stuff from main