Remove traces of ModelSupport