Remove some code that used to do something but does not anymore, mainly

Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135197 65c4cc65-6c06-0410-ace0-fbb531ad65f3