Removed TODO that no longer applies because the Template class was re-written.