removed TODOs as they are now issues on github