Remove commented-out code and stuff it used