Remove generic code from Axis definition