Remove TODO that has been done...