Remove unused code

There is some code which is currently unused.

- Defined blocks with TODO content.
- An empty implementation of hook_watchdog.
- Empty comment blocks / blank lines.

I have committed the attached patch - it doesn't change functionality, just tidies the code a bit.