Clean up some commented out code