add group model and remove some unused associations