Remove unnecessary method and test

Change-Id: I0d212920ffee484ee0eabab7e72798fa1079b7eb