Cleaned up WithdrawChallengeCommand