Removed an unused variable and a duplicate in data

Minor tweaks, just some things I noticed while reading the code.