NAWQAAN-381; remove extraneous code