Mecha: clean up tree

Change-Id: Ibfbf789da959fa2c1d2769b04e5786e103455106