g3: bye bye Torch

Change-Id: I71f79a64aaf1cdb1b1808e9995084818f1fc359c