Accumulated cleanups to Kubelet

ok