PHPMD: Unused Code

Cleanup of unused code using PHPMD