Remove unused annotation
Work on key value store.
Remove broken methods (no Array support :( ). Use KeyValEntry where possible.