Update Error Messages and Remove unused constant.