Issue #331 - Remove puzzle