remove dead code, clean code fix like query.