Cleanup: remove class member that can be a local.