fusion3: Mass consolidation

* Deduplicate all teh things!

Change-Id: I973316424b299316b0490108ae2d42fcdd94566f
fusion3: Mass consolidation

Change-Id: I9a97e2e4890d4dd64d7e5350293a024b656c485c