Remove and minor clean-up
trunc and stat
Remove unused local variables