Remove the useless function and some comments