cleanup comments and dead code