Further cleanups of associated models.
Missed some on last commit.