Bugfix for EMT 7TeV, and cleanup of unused uncertainties in MMT and EMT 7TeV