update helpers and remove unsed mixins