Fix docs and remove mixins