[3.9] Remove unused functions