remove some more dead&useless code