Remove deprecated error messages #1800