Last cleanup before extraction and deprecation

Removed the duplicate files that Alan previously moved into the 'Hardware' directory.