Clean-up

Change-Id: I1057db367b7c53653df3b1f47506d501da94ca48