Some clean-up

Change-Id: Ic65d1d5dcf2a0a7dbc0b382002b15e47f7998344