Remove direct manipulations with namespaces