Hardware keys clean up

Change-Id: I7905e0c409d7298549bf641152013a719557b5bf