Update to remove extra problem blocks