Some clean up

Change-Id: Ifce101cf5f2d8bc1368c5673c977dac257d2c091