Greetings,
I've managed to finish the cleanup. I placed it all in a single PR - it was easier that way since the changes were incremental; I hope I don't make Razvan that mad when he has to review the code :D.
There's also some code left commented out, I'll be waiting for Razvan's input on what to do with it.
Unfortunately there has been another change in the Phobos repository which added a linting error, and that's failing the testing pipeline. I'll need to get that fixed.