Remove useless calls