Cleaned up Registry 2