More demo notebook cleanup

Removed unused imports and use normal dictionaries
instead of ordered dicts.