Use adapt() instead of interface adaptation.
Remove some other used of interface constructore adaptation.