remove unnecessary file delete
Merge branch '2.3.x' into devel