Database scheme cleanup