renamed SorcerAccount to ServiceAccount
cleanup
cleanup for SONS