remove commented code part2