master remove commented code