Removed unused variable.
Removed unused variables.
Cleaned up some PHPMD warnings.