Merging the two calo only input makers, remove the dependency on CaloOnlyMVA and fixing some EDM issues