Fix issue #166

Please remove commented code.