remove more useless code