Dropped more unused namespaces.