taking unnecessary code out