Change to the orphan and deprecation policy