glacier: clean up cm3602 stuff

Change-Id: I614e909a797aeef01f02c2cde70a7d3a45454c6a