(#667) - remove commented code