remove some upserts in hopes of better performance.