Any-2-any should not require id field
clean up compound keys