Remove duplicate calls
8 files changed