NAWQAAN-381; remove more extraneous code