Don't need them in this namespace.
Update to dicts, show simplified usage.
Cleanup.