remove unused dependency, and fix path to other.
Merge branch 'master' into split

* master:
  remove unused dependency, and fix path to other.