These files should be removed (if we go with this solution).