Cleaning some comments and todos