Cleanup, remove commented out lines.
Moar cleanup, remove commented out code.