bug
remove commented/useless code