Remove Line model and move group logic into Trip