Clean up error messages and alerts

Cleaning error messages and alerts.