Removed idempotency related code which was not working