Fixed combos with double arrays and deleted useless helpers