Issue #61: remove commented out code