Checking some TODOs as done