Removing obsolete 'temporary' comments and fixing AK4Calo to use AK5Calo