modded _store_listing to return the dictionary instead of modifying the
empty dictionary given as an input argument
remove some old unused lines