Squash Registry methods JobTarget & JobTargetState into Job

isn't this still relevant?