remove debug-macros
Merge branch 'master' of github.com:CVVisualPSETeam/CVVisual
move tracepoints before return