CTFAPIRKDescriptors removed and CTFAPIRKConfigurator with categories used instead. Cleanup in tests.