Sure, I’ll play around with the ‘removal’ case tomorrow morning.
This morning I migrated this to the new plugin api.