cleaned up some unnecessay code