Consider remove commented code