Cleanup commented-out code