clean up references to `extra` field