Cleaning up some old commented code