Get rid of some invoker stuff