removed parts of x macros in  epanetmodelcreator