[refac] get rid of Term
[refac] remove unneeded Pattern