OK - thanks wasn't sure - will remove commented code and TODO.