Clean up

Change-Id: I997e9dd0091601dc0d6a0ba67497a6b26a6919fe