Reorganize error messages
Get rid of old/useless code