Simplify namespaces, leave only required fns