Updated master agent with new remove_message