Revert Deduping

This reverts commit a543548a6b9cb9fcf33dba94e02e19079e261634.

We need to be deduping closer to the templates so taking this back out for now.