e610: cleanup

Change-Id: I101687827616d478ac178fe544ab3d8e1e9a295c