MDL-36435 cleanup