Remove entries that have been split out

follow-up to dd357f1adcb9ab7003656791be948e219f9be316