DB upgrade mechanism prepared for next updates
DB upgrade mechanism prepared for next updates, fix
some cleanings