Completely rework the integration.
Remove changes done for nothing.