[FIX] Hardcoded confirms removed