UNTESTED: Rewrite m_remove commands for compatibility with 2.0 servers.