remove redundant ExpressionFormat node
tests fix : rename ExpressionFormat to Format