[Ready][3.9] Remove unused functions