[Code] Code cleanup

Remove code where variables were defined and then redefined as same
thing two lines down when there was no change.