clean up and add reassociation