Spill and Pontus cleans out the todos