Removed redundant timeouts