Cleanup imports in Torch

Change-Id: I54420eb69497f3a9982db1dbffcee02f9a8a59d5