Added option to keep unused covs