Cleaning up container ID handling inside kubelet