Clean up Dict interface