remove dependency on diff package