remove extras, it's unnecessary with the new request-unique contexts