Remove evil commented-out code