Deduplication

These may be better off in their own files?