Refactor unnecessary fn calls in relation