removed useless calls