Removed some code TODOs that are now GitHub issues