glacier: cleanup

Change-Id: Id51f8a2092ca85265f2cb3ca13f819be5acdbec6