Remove some actually unhelpful error message improvements