Added 'remove account' and 'logout' in order to cleanup on exit.