Add yum and apt to dependencies, clean up