Fixed simulation cleanup after normal finish