Clean up model hierarchy associations