Get rid of EXECUTE macro