Fix usage and crashes under multi-client mode
Really fix plugin remove; cleanup