Remmove the contractor model and reuse subcontractor for both sets of data