MDL-35851 code cleanup