Clean tree

Change-Id: I20cc476389478bdeae3b80e9ab10b039d0455f67