Removed unnecessary setTimeout