Remove last reference to CHH namespace