Removed dead code.
Added to TODO note, so that updating is clear.