Revert "Done #9 merge cart after logout"

This reverts commit 103cf88727ec8f5ee9053a7990e1b6738a623fbb.