removed a not really necessary macro