remove some necessary code