Remove un-needed comments and counter code.