Remove some commented out crap