cleanup namespaces in cleanup2