Adding a few leftover stray AK5-AK4 transitions and reverting RecoEcal and RecoEgamma changes which migrated by accident
Removing one AK4 trimmed collection that is unnecessary