Namespace clean-up