remove import cruft
fix up addCraft and mergeCounts