[tidy] removing unneded comments and dead code