remove some more relation.primary_key things