removing comments and dead code