remove some Bugs