Speedy: clean up tree

Change-Id: I29e3918aa3c3aada13f7330f7fd44cd103beb06b