Remove unused local bindings.
Merge pull request #790 from fracek/remove-unused-local-bindings

Remove unused local bindings.