Restructure unconfirmed store, cleanup
Refactored unconfirmed store