Clean out some old commented-out stuff