cleanup member add/remove flow on fe side, fix some bugs and done for now