Clean after yum and other improvements