(#92) removed obsolete mixins in favor of compositions.
Merge branch 'feature/92-remove-mixins'