Removed unnecessary timeout