Remove TODO comments, we have Github issue tracker for that