glacier: Cleanup

Change-Id: I134cd7356057c672352eda587a1a3663916e9f37