Remove unused interfaces

Change-Id: Ie6fb16a992e15d3ded98727bb319e66bd8093bd4