Merge "Finish delete account functionality"