kr ogg2 cleanups