ref #9448: remove E4 from file names - coninue and cleanup