Optimize comments, remove dead code