Removed testing macro