Cleaned up todo messages in client.