Remove unnecessary code

Never gets called, so remove it.
Minor cleanup

One less line of code, longer variable name, clearer intent.