Accounts system cleanup

Accounts system cleanup

Accounts system cleanup