Accumulated cleanups to Kubelet

Fixed in new push