Remove addTimeout calls