Fix a bunch of problems. Strip unneeded and unused XNIO references