Removed macro usage.