Remove matrix from env block