Refactor usages of removed mixins