Merge "Trim more *_contexts files"