removing unneeded calls