Dedup

Yep :) That's why all the acceptance tests are green...