last changes on deleteAccount()