Merge "Drop the legacy and un-used _interface"