These two TODOs were todone