Remove defunct database classes, tidy up the survivors