Remove commented out unecessary code