CB-5307: Remove references to Callback and Incubator