core and acct cleanup