Remove redundant MatchClause & redundant testcases