added server and remove repeated dependencies