Remove old tagged method.
fix typo.
fix integration test fail.