Remove extra unneeded calls.