OP-1592 Cleannup
OP-1592 Same logic using dataObj