Remove block kriging
Minor changes