some cleanups

Change-Id: I31376f197bbb9076659ef2270811adc6540f2109