Fix a memory leak where we weren't killing items in the data map