Cleaning unnecessary code