Remove code that was replaced and todos that were fixed.

Also adds a new TODO idea, that might be very useful.