cleaned up some unnecessary code