Code cleanup in datapath component. Change-Id: I03585bd319e835a28de37ae98fb8edafbc1820ee CRs-Fixed: 3568991