More account class cleanups