Updated to remove mixins and use utils

Removed mixins.