Removed the Registry completely out of the core