Remove TODO -> we use issues