Initial clean up of the chips code

Change-Id: I56a3dd5968a3ea435d6dcae9256021bac1f74ee6
7 files changed