remove some things
fix