Removing use of xctool