Accumulated cleanups to Kubelet