Clean up. One norepro bug - random swirly on grapple