Make invalid runs clean up

Make invalid runs clean up