Refactoring
Removed axis