Derp and remove TODOs that are already done