Lots of code cleanup, removed Panda code, all grizzly, cleaning up mapping

No match.