The Mixins file has been cleaned up.