This one also seems like it could be cleaned explicitly. Basically I think it would be good to remove all of the BoundedHashMap's if possible to avoid introducing new concepts here. I think as long as you can lookup the stage's associated with a given shuffle dependency you can clean all of these propely.