Clean up association orderings in models