Removed unneeded logic from confirmations