Remove zero units & unnecessary interpolation

2 minor optimizations