Moved confirmations pickle out of modules