Fixes Performance issue on large Registries (100 000 objects and more).
Cleaning