some todos and comments deleted