never mapped the new results to the context, also remove the unneeded hardcoded includes