Remove X_AXES and remove obsolete and commented code.