more minion clean up + factor out some static util