Issue #811: Remove from HTML