Gallery2D: clean-up