MT#8507 Remove more unused functions.