Remove TODO

All to do items should be added as issues on GitHub as enhancements