#381 migrate db and get rid of all convert to extras calls