Removed remaining error messages