remove unused mixins
add new mixins