tidying server fixme
tidying server fixme