toroplus: cleanup

Change-Id: Iafc5f244aad5412b4a2ec3d6475bd57eff5476a1