tidying server fixme