clean up of some unnecessary code