Remove xctool dependency