Cleanup old worker datastore classes. Contributed by Nick @ Beeper (@fizzadar).