Remove some messages, add error messages