removed some comments
removed some todos and comments