Deleting some unnecessary code