MDL-41894 feedback: Remove unused code, which is generating warnings