Remove conditionals from Shepherd

Bumb version major, since breaking API changes