remove some obsolete TODOs from code
remove some obsolete TODOs from code

Former-commit-id: 95f93398c6940f75bdd5cdbc986e4d58a64a543d
muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous,muslih/alfanous