and change it from a class to a simple method, there is no need
for it to be a class.

Change-Id: Ia8c263682d81371767f43acf1028c815923b4845