Fixing minor issue with callback deletion

Converting it to a deferred