Stop handling model refresh centrally, removing check overhead (improving performance) and fixing bugs