Completing switch to sherpa dependencies