Removed TODO that was done...