remove unneeded calls