toro: cleanup

Change-Id: Id04e19a5c6f2d78dad53b4ba792777c4de9e1054