Some Cleanup

Change-Id: I5f978e3d413690e956bb6f7fc56a62f82307416a