Get rid of debug println, add `TODO`
Merge branch 'feature/debug-cleanup' into develop