Remove obsolete model builder