WIP: Remove duplicate insertables

This doesn't have unit tests yet.

Change-Id: I85697c2264a8b28f86c655a228900663dd9be1e9
Merge "WIP: Remove duplicate insertables"