remove commented code or leave TODO