Long term all of the supported operating system code needs to be ripped out and redone, so the stubs will have to go anyways. I don't think it adds any value to keep them for now.