Removed redundant code
Completed work on armor management