Audit and remove obsolete @todo comments and dead code

I scope creep'd myself a bit here, but mostly to the letter of what the task set out to do, so I will commit this and keep moving forward. I hope this resolves more problems that it causes.

Looks like a lot of great code cleanup!