Removed and updated mixins