Clean and fix

Change-Id: Id66945f12f3508499272babaa633a940b3ae39fa