Fix store_retrieve_peers to correctly cleanup.

Change-Id: I6e88af9c15cccce7413047d3e0a012cf679c009d