Removed unecessary calls