Merge "Remove dead code from TetherInterfaceSM"