Good work Simon. Looks like a pretty clean removal.
Keep posting your progress. Interesting stuff.