Clean-up

Change-Id: I446a07d5853dae77aedea82208dc7bd839bac124