Removed TODO comment that has been implemented