Remove data type context from Job type