Roll back some changes

There were some duplicates in the code that I removed. I also rolled all changes regarding Weighted* mixins since there was no consensus about that.