Clean up some commented code