Remove commented out junk