few more minion clean ups