Tangle generators cleanup