Minor bugfix
wip
Remove redundant habtm relation
Fix regressions