Forgot to remove some entries from the NamespaceMap