More account functionality cleanup.