Minor clean up of SAMT account mgmt