further Grizzly cleanup