Remove TODOs havoc doesn't like or think we will ever do.