Clean out some commented code