upgrade to 4.1

please review @eleith 
i think we don't need all these mixins. (they don't seem to get called in any of these files, yet the mixin gets put in, in every file)...