cleanup + more packages to try