Stop creating AnP ModelGroups

This is the first part of the separated PR that was previous #226. This contains the code changes to stop creating model groups, which is possible now that #258 has been merged and run.