Issue/475/xserver purge

- resolves #475