Fixed removing todos