extended timeout and removed unused instances.