Removed pointless static declaration

Change-Id: Ia5b37f99456614e8dbb1c44f3ebb4ad9398ce18e
Removed duplicate class registration

Change-Id: Ic22a190c5d44e37e99067decfe8bec74422efcb1
Merge changes Ic22a190c,Ia5b37f99

* changes:
  Removed duplicate class registration
  Removed pointless static declaration