Removed macro in response context