Removed unnecessary timeouts