removed more useless code