General cleanup of xo.1.