Cleaning up some commented code