Remove duplication.
36 files changed