Remove db_type completely