Cleanup Grizzly defs