Change a couple of TODOs into NOTEs as there is nothing that can be done.