Kills lots of really old cruft and adds a little cruft to actually
make the driver work with recent 2.4 again.