more cleanup prepping for simple mode