removed unneeded old macro