Cleaned up code - some adjustments to selected files

The following adjustments were made:
- Sections of code should not be commented out (PHP:S125)
- Lines should not end with trailing whitespaces (PHP:S1131)
- Unused local variables should be removed (PHP:S1481)
- Unused assignments should be removed (PHP:S1854)

Author: DanProgs