Remove TODO I'm not going TO DO