cleanup the AccountManager API
diff --git a/src/com/android/exchange/ContactsSyncAdapterService.java b/src/com/android/exchange/ContactsSyncAdapterService.java
index ed954c3..b778395 100644
--- a/src/com/android/exchange/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/ContactsSyncAdapterService.java
@@ -81,7 +81,7 @@
         // Find the (EmailProvider) account associated with this email address
         Cursor accountCursor =
             cr.query(com.android.email.provider.EmailContent.Account.CONTENT_URI, ID_PROJECTION,
-                AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.mName}, null);
+                AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.name}, null);
         try {
             if (accountCursor.moveToFirst()) {
                 long accountId = accountCursor.getLong(0);
@@ -90,7 +90,7 @@
                         ACCOUNT_AND_TYPE_CONTACTS, new String[] {Long.toString(accountId)}, null);
                 try {
                     if (mailboxCursor.moveToFirst()) {
-                        Log.i(TAG, "Contact sync requested for " + account.mName);
+                        Log.i(TAG, "Contact sync requested for " + account.name);
                         // Ask for a sync from our sync manager
                         SyncManager.serviceRequest(mailboxCursor.getLong(0),
                                 SyncManager.SYNC_UPSYNC);
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 8a103a9..919a49d 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -355,7 +355,7 @@
                         android.accounts.Account acct =
                             new android.accounts.Account(Eas.ACCOUNT_MANAGER_TYPE,
                                     account.mEmailAddress);
-                        AccountManager.get(SyncManager.this).blockingRemoveAccount(acct);
+                        AccountManager.get(SyncManager.this).removeAccount(acct, null, null);
                     } else {
                         // See whether any of our accounts has changed sync interval or window
                         if (syncParametersChanged(account)) {