Clean-ups in registry class, removed obsolete code