Cleaned up and removed obsolete local_store
Working round-trip