changed associations and removing HABTM