Delete flow and account details flow fixes
Switched to using Nodiak + fixes