[TRE-1027] remove context, motion