remove commented code before merge