Clean up unused variables and VIM directives.

Copyright.