Clean-up

Change-Id: I77cb9ff22e16003b7b71698dbcf035ae42729596