cleanup and equalisation with mangrove-server stuff