Git rid of extra namespaces.