<DA-406> remove unused code[2]
<unstable> Merge branch 'DA-406' into unstable

* DA-406:
  <DA-406> remove unused code[2]