Clean-up

Change-Id: I1043bffe9d67bbcf71db874a10e8445b023ff571