You should call clearOldValues() on these two maps in DAGScheduler.cleanup()