cleanup some unnecessary code