LPS-32250 Remove one to many mappings
LPS-32250 Regenerate