remove old helper macro