Eliminate references to ModelExtensions