[forge-commits] [forge/furnace] 8585cc: Code cleanup