Remove TODO that was don