Cleanup namespaces and other stuff