Removed some TODOs

Added them into the GITHUB issues