Remove TODO, already implemented. See #1"