some clean up

Change-Id: I62fba45e914f6ad3b729233287428445fe8af1b0