Remove more incubator references