Remove adding multiple timeouts