Clean up dependencies between namespaces