Simplified models and removed associations.