clean up some commented code