Various updates..

remove obsolete code and so that this works with the Dropship Core
module. (both share the same subcontractors table..)