remove some unessential code