Remove unneeded calls