Remove unused code, and fix an issue where a variable name was the same as a class name.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>