further cleanup Multiplexer