cleanup unnecessary code