Which parts do you plan to keep?

A separate PR is probably better.