Removed unnecessary code