Some cleanup

Change-Id: I5c208f3bcac73c123f31a4e82562460e450cbca8