Add back contact info in the copyright notices.
Remove unused variables.