Removed unecessary calls to deliver