Removed all 2011 code for Mixing