http://work.netxforge.com/issues/415
- instrumation
- refactoring / unused