hide before cleanup, v2.0