Get rid of the macro-template