Remove X3 defines