Issue #276 - Clean up file
Issue #276 - Delete unused code

* References local private variables that are not used in the current
  execution flow