removed logging and finished xstool