Cleaned up improper event, query handling messages.