Remove unued code and comments.
Add benchmark code.