Scott A and Scott D removal of adaptation logic