Remove dead code
Remove interface used only for testing which duplicates (with a
different name) an existing, correct, interface. Update the one test
using the interface.