cleanup things

Change-Id: Ibf2a198ba96a77364aa31fa5e4c1cf2db43a3955