Slight code cleanup.

Removed a bunch of commented out code and #if def-d code.