Remove unused define and commented out code.

Obvious fixes.