Refactoring delegate tools to use static methods similar to apitools