clean up tree

Change-Id: I10fbe424258e76da0338877d4315a963064b0bc5