A little cleanup

Change-Id: I8b531739b62ec493363972ba7d0dcb0661c427e0