Big Twisted cleanup