Cleaned up some of the registered namespaces