Merge "Tethering: remove redundant source code"