Removed and update extraneous error messages