Cleanup of namespaces refs #27