supernova integration cleanup