Removed debug code
Added No|No support for armor