cleaned unnecessary code