Removed TODO commenting,  YAGNI... clint