remove unuse func
fix some