Clean up the server adapters a bit.