cleans up TODO comments
Merge branch 'origin/dev'