Remove commented, unecessary code