Clean up AccountsDb #2004