* further reverts of accidental changes and improve Hardware code
* continuing to revert that deletion
Merge branch 'gps'