Cleanup

removed and reorganized some error messages