Deleted some unnecessary code