supernova integration more cleanup