#MLHR-678 #comment Added state clear for the data structures in endWindow.