removed obsolete code
Merge pull request #2600 from kurund/relationship-cleanup

removed obsolete code