Remove unused import and fix the AxisMapping references