Remove code already in --prepare-install