more refactor
remove commented useless code