Cleaned up the SQL messages