Moved TODOs to Github issues