Revert "Minor clean up of SAMT account mgmt"

This reverts commit 76ab36e8bbceba40e45ffafe8d703c0137a981d4.