Axe restructuring.
Remove unused variable.
Finish Axe restructuring, modify a little bit of Swords stuff as well.