remove commented out stuff