delete useless code
fix tests