final helper re-hookup clean-up