Glacier: clean up tree

Change-Id: Ifa3e920fb65a2b14de6275c9375630a5aac4faa4