Remove TODOs, should be resolved