add() return created SimpleChannelProviderFactory instance. remove() missing Lock and remove by instance as well as by name.