Issue #180 Cleanup of commented out code.