removed useless function and call