POM clean-up for demo module.
Improved measurement util.