cleanup the storage keys and point iteration in the shard's code

Done.