Yum 3 cleanup

Merge in of yum cleanup