CLSN-2141 code review
remove is under settlement field