Issue #343 - Remove puzzle