Replaced PersonJobRef reference with relation reference
Removed unused code and added TODO