cleaning unnecessary code