Removed old namespaces