More clean up of the MWC2013 branch.