Merge "Tethering: remove dead code"