Remove references to modules/mixins