@ess090502 Turned off came chest - causing bugs

Uncomment when testing is needed. By the way, some classes are missing
since they are not needed - moved into the registry.