fix bug 1034185 and bug 1034192

Removes a bunch of old code that must have been there for the creation of kuma.