Remove unneccesary local allocations. Remove unused variables and code. Add missing return statement. Fix missing return value.
Remove unneccesary local allocations.
Remove unused variables and code.
Add missing return statement.
Fix missing return value.


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

jordemort/e17,jordemort/e17,jordemort/e17