Switch to db_config
Clean table/assignments