Code cleanup and remove < 1.3.0 driver support