Misc cleanup

Mikhail Mazurskiyrequested to merge
ash2k/cleanup into master

Pick up https://github.com/kubernetes/kubernetes/pull/118055 and address various TODOs.

Merge request reports