[5.7] Remove some spurious code