Cleanup in ch5 namespaces