added server file and remove unit correctly