Removing that partial macro implementation