Issue #11 remove commented out code