Remove TODOs and update comments