Cleaners now use Registry #166