Minor cleanup
Code cleanup
Removing vestigial methods, moving to relationship definition