Moved TODOs to GH issues