Minor Optimizations

Just removed a few variables we never use.