tidying up messages from server