Merge "Removed unused variable macro usage"