Removed unnecessary code here too