Simplify the associations in the models