removed unneeded calls