am adf65fa8: cleanup and deduping schema

* commit 'adf65fa8048eaf04e12e2b36e3ad9a78429ce96b':
  cleanup and deduping schema