Deleted leftover test code

Deleted leftover test code
Enhancements to measuring tool

Enhancements to measuring tool (rendering of endpoints).
Deleted leftover code

Deleted leftover code