less unneeded calls to server

Signed-off-by: bovitobo <bovitobo@yahoo.com>