delete some expressions and simplification of test