some kr stream cleanups