Remove TODO that was already implemented