Server manaement cleanup... needs a bit more