Performed some code cleanup to remove blocks of code that had been
commented out