Removed unneeded calls.