Remove code duplication and move to D72.8