Improved logging
Removed test code
field limit in benchmark in inclusive