Stat templates cleanup