Fix issue in SE cleanup