merge fume and fumetrap, simplify setup