Remove unused variables. Fix reuse of a variable and various warnings
Remove unused variables. Fix reuse of a variable and various warnings


git-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@19379 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

jordemort/e17,jordemort/e17,jordemort/e17