Remove commented out stuff