remove server, implement flow to plugin name