Remove TODO (using issue tracker now)