Restructuring of the hardware section (i.e. removing duplicate/obsolete stuff)