Cleanup for SuperNexus