some Stat cleanup