[Ready][3.8] Remove unused files