refactor
merge fumetrap into fume, has no standalone use anymore anyway