Clean up solar armor iteration