update && remove some code