removing obsolete models and mixins