cleared useless code