Remove some dead code from a test

Change-Id: I55c7b7d6c2feb64d0ae02d528d40482921019c9c
Merge "Remove some dead code from a test"