Cleanup remaining adaptations