Kill remaining quicktorch wonkiness

Change-Id: I7b0919f37a9642001373bfd26a84c8362980ed7c