fixed useless code