#25 Refactor to implement Origin Delete