DEBUG macro no longer used