remove some code unnecessary