Clean up namespace and dependencies.