Move domain removal into the plugins.