Issue #18 - remove the original puzzle