Add international shipping addition & cleanup