Remove leftover from 9.0 implementation