Removed TODO on template question