Clean up code for armor command.