remove checks for cmaccount

Change-Id: Iceb72b109b925ea0ec9d17a43229aad1433d358a