MDL-43089 Remove some unneeded code.