Remove some more backward-compatibility stuff we don't need anymore.