PIM-838 : Rename relations
PIM-870 : Remove unused code