remove some unwanted code