Remove unnecessary full namespaces