Remove last of unneeded setUp methods

Change-Id: I22ee95ff1032129f14981b75ee674cf2d9d2bbaf
Merge "Remove last of unneeded setUp methods"