Undo HABTM

Changed back to has many through