Issue #3124354 by daffie, abhisekmazumdar, alexpott, johnwebdev, catch, Beakerboy: Remove unnecessary classes from the database drivers (cherry picked from commit a11ed7af)