Cleanup, update server/client start messages