Cleaned up, removed unnecessary mixins and updated mixins.