Cleared a lot of todos