Clean up Namespace implementation.