Remove Torch + Trebuchet

Change-Id: Ib07db3087e251fbb37f00b31a9da59b080e1d16b