More pre-2.6 cruft to be removed