Remove commented-out code.
Fix everything.