more cleanup on collapse block