remove TODO
let datamanager re-use statements
Merge branch 'master' of https://github.com/boformer/Proto/