Use 'clean' instead of 'clear' consistently.

Change-Id: If8d871379e08c8517f25901ccd8fc63add04468a