Delete one DataBase class, and upgrade two classes