Removing naming TODO's from PHP template