Work on cleaning up dirty associations [ci skip]
Switch back to pry-debugger
Cleanup single associations
Move some methods into private
Remove unused file