Old TODO removed