more namespaces cleanup