Remove TODO, use issue tracker for improvements