drop version dependent macro and adapt to latest mux api