clean the junk prepping for #36