Cleanup of namespaces and configurability.