cleanup and modified namespaces