Cliff the Trap Remover

Ref: MFC-078