Remove cruft from support for old versions