Cleanup and prep for rebuilding adapter callbacks