Removed unneeded calls