relations fixes
unnecessary annotation removed
tests
visit
refactoring