Remove timing instrumentation.
Comments
Code cleanup (final vars, etc) and formatting.