Remove dependency on which binary