Border adjustment tax scrapped from GOP framework