Remove hardwarekey config, fixes not having settings that should be there

Change-Id: Ifcd66c50cee89fef9de96a45bb7282b46bb531a6