Remove unused code and comment.
Add optimization.