Fixed merge problems

Removed some lines of code that were added during a merge. these lines
of code were unnecessary / broke the script.