Cleaned up Registry